From c99b1edf39207fc790d3ba5f69da01b51c234689 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 10 Sep 2007 18:07:39 +0000 Subject: [PATCH] Fix serial number comparison regression introduced recently. (#474897) 2007-09-10 Behdad Esfahbod * gdk/x11/gdkgeometry-x11.c (gdk_window_queue), (_gdk_window_process_expose): Fix serial number comparison regression introduced recently. (#474897) svn path=/trunk/; revision=18789 --- ChangeLog | 6 ++++++ gdk/x11/gdkgeometry-x11.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c72fb321b..a742a6238b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-10 Behdad Esfahbod + + * gdk/x11/gdkgeometry-x11.c (gdk_window_queue), + (_gdk_window_process_expose): Fix serial number comparison regression + introduced recently. (#474897) + 2007-09-10 Richard Hult * gtk/gtksearchenginesimple.h: Build fix, correct a typo in the diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c index 017acfdeff..da572a8d13 100644 --- a/gdk/x11/gdkgeometry-x11.c +++ b/gdk/x11/gdkgeometry-x11.c @@ -1052,7 +1052,8 @@ gdk_window_queue (GdkWindow *window, GdkWindowQueueItem *item = tmp_list->data; GList *next = tmp_list->next; - if (serial - item->serial < 0x7FFFFFFF) + /* an overflow-safe (item->serial < serial) */ + if (item->serial - serial > (gulong) G_MAXLONG) { queue_delete_link (display_x11->translate_queue, tmp_list); queue_item_free (item); @@ -1143,7 +1144,9 @@ _gdk_window_process_expose (GdkWindow *window, { GdkWindowQueueItem *item = tmp_list->data; GList *next = tmp_list->next; - if (item->serial - serial < 0x7FFFFFFF) + + /* an overflow-safe (serial < item->serial) */ + if (serial - item->serial > (gulong) G_MAXLONG) { if (item->window == window) { -- 2.30.2